Merge from mainline.
authorXue Fuqiao <xfq@gnu.org>
Fri, 28 Feb 2014 03:05:03 +0000 (11:05 +0800)
committerXue Fuqiao <xfq@gnu.org>
Fri, 28 Feb 2014 03:05:03 +0000 (11:05 +0800)

Trivial merge